From f6d80a7f57c14fc9ae926e505ec43d0f236cab97 Mon Sep 17 00:00:00 2001 From: "emellor@leeni.uk.xensource.com" Date: Wed, 23 Nov 2005 19:37:33 +0000 Subject: [PATCH] Reverse accidental commits for changesets 8001 and 7996-7999. The Mercurial Queues extensions suddenly looks a lot less useful than it first seemed. Signed-off-by: Ewan Mellor --- linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c | 6 +++--- tools/console/Makefile | 2 +- tools/examples/block | 6 ++++++ tools/examples/block-common.sh | 4 +++- tools/examples/block-enbd | 4 ++-- tools/examples/block-nbd | 4 ++-- tools/examples/xend-config.sxp | 2 +- tools/libxc/Makefile | 2 +- tools/libxc/xc_linux_build.c | 2 -- tools/python/setup.py | 2 +- tools/python/xen/xend/XendLogging.py | 2 +- tools/python/xen/xend/server/SrvDaemon.py | 4 ---- tools/xenstore/Makefile | 2 +- tools/xentrace/Makefile | 2 +- xen/Rules.mk | 4 ++-- 15 files changed, 25 insertions(+), 23 deletions(-) diff --git a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c index 91ff5069aa..a3efed0d05 100644 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c @@ -155,8 +155,6 @@ struct netfront_info (_list)[0] = (_list)[_id]; \ (unsigned short)_id; }) -#define DEBUG 1 - #ifdef DEBUG static char *be_state_name[] = { [BEST_CLOSED] = "closed", @@ -902,7 +900,7 @@ static int network_close(struct net_device *dev) { struct netfront_info *np = netdev_priv(dev); np->user_state = UST_CLOSED; - netif_stop_queue(dev); + netif_stop_queue(np->netdev); return 0; } @@ -1166,6 +1164,8 @@ static void netfront_closing(struct xenbus_device *dev) DPRINTK("netfront_closing: %s removed\n", dev->nodename); + close_netdev(info); + xenbus_switch_state(dev, NULL, XenbusStateClosed); } diff --git a/tools/console/Makefile b/tools/console/Makefile index 3fc846eb56..a27aa8e458 100644 --- a/tools/console/Makefile +++ b/tools/console/Makefile @@ -9,7 +9,7 @@ INSTALL = install INSTALL_PROG = $(INSTALL) -m0755 INSTALL_DIR = $(INSTALL) -d -m0755 -CFLAGS += -Wall -Werror -ggdb3 -O0 +CFLAGS += -Wall -Werror -g3 CFLAGS += -I $(XEN_LIBXC) CFLAGS += -I $(XEN_XENSTORE) diff --git a/tools/examples/block b/tools/examples/block index 7ea044f4bc..79636ac20a 100644 --- a/tools/examples/block +++ b/tools/examples/block @@ -3,6 +3,12 @@ dir=$(dirname "$0") . "$dir/block-common.sh" +case "$command" in + online | offline) + exit 0 + ;; +esac + expand_dev() { local dev case $1 in diff --git a/tools/examples/block-common.sh b/tools/examples/block-common.sh index 6c44f87c45..2e46831111 100644 --- a/tools/examples/block-common.sh +++ b/tools/examples/block-common.sh @@ -21,7 +21,9 @@ dir=$(dirname "$0") findCommand "$@" -if [ "$command" != "add" ] && +if [ "$command" != "online" ] && + [ "$command" != "offline" ] && + [ "$command" != "add" ] && [ "$command" != "remove" ] then log err "Invalid command: $command" diff --git a/tools/examples/block-enbd b/tools/examples/block-enbd index 75c6f257aa..c58adb595d 100755 --- a/tools/examples/block-enbd +++ b/tools/examples/block-enbd @@ -11,7 +11,7 @@ dir=$(dirname "$0") . "$dir/block-common.sh" case "$command" in - add) + bind) for dev in /dev/nd*; do if nbd-client $2:$3 $dev; then write_dev $dev @@ -20,7 +20,7 @@ case "$command" in done exit 1 ;; - remove) + unbind) nbd-client -d $2 exit 0 ;; diff --git a/tools/examples/block-nbd b/tools/examples/block-nbd index 8c5cb17b79..142a403c0f 100644 --- a/tools/examples/block-nbd +++ b/tools/examples/block-nbd @@ -11,7 +11,7 @@ dir=$(dirname "$0") . "$dir/block-common.sh" case "$command" in - add) + bind) for dev in /dev/nbd*; do if nbd-client $2 $3 $dev; then write_dev $dev @@ -20,7 +20,7 @@ case "$command" in done exit 1 ;; - remove) + unbind) nbd-client -d $2 exit 0 ;; diff --git a/tools/examples/xend-config.sxp b/tools/examples/xend-config.sxp index 06758f9a6b..f600edc19d 100644 --- a/tools/examples/xend-config.sxp +++ b/tools/examples/xend-config.sxp @@ -34,7 +34,7 @@ # Specifying 'localhost' prevents remote connections. # Specifying the empty string '' (the default) allows all connections. #(xend-address '') -#(xend-address localhost) +(xend-address localhost) # Address xend should listen on for relocation-socket connections, if # xend-relocation-server is set. diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 57aa64bfaf..08eb0c42a0 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -52,7 +52,7 @@ CFLAGS += $(INCLUDES) -I. # Define this to make it possible to run valgrind on code linked with these # libraries. -CFLAGS += -DVALGRIND # -O0 -ggdb3 +#CFLAGS += -DVALGRIND -O0 -ggdb3 # Get gcc to generate the dependencies for us. CFLAGS += -Wp,-MD,.$(@F).d diff --git a/tools/libxc/xc_linux_build.c b/tools/libxc/xc_linux_build.c index b111158a95..d61ecfa549 100644 --- a/tools/libxc/xc_linux_build.c +++ b/tools/libxc/xc_linux_build.c @@ -480,7 +480,6 @@ static int setup_guest(int xc_handle, #define _p(a) ((void *) (a)) -#if 0 printf("VIRTUAL MEMORY ARRANGEMENT:\n" " Loaded kernel: %p->%p\n" " Init. ramdisk: %p->%p\n" @@ -501,7 +500,6 @@ static int setup_guest(int xc_handle, _p(vstack_start), _p(vstack_end), _p(dsi.v_start), _p(v_end)); printf(" ENTRY ADDRESS: %p\n", _p(dsi.v_kernentry)); -#endif if ( ((v_end - dsi.v_start)>>PAGE_SHIFT) > nr_pages ) { diff --git a/tools/python/setup.py b/tools/python/setup.py index 2494e53b0a..79b9730a1a 100644 --- a/tools/python/setup.py +++ b/tools/python/setup.py @@ -4,7 +4,7 @@ import os XEN_ROOT = "../.." -extra_compile_args = [ "-fno-strict-aliasing", "-Wall", "-Werror", "-ggdb3", "-O0" ] +extra_compile_args = [ "-fno-strict-aliasing", "-Wall", "-Werror" ] include_dirs = [ XEN_ROOT + "/tools/libxc", diff --git a/tools/python/xen/xend/XendLogging.py b/tools/python/xen/xend/XendLogging.py index 62a1d1d37d..053bf4703e 100644 --- a/tools/python/xen/xend/XendLogging.py +++ b/tools/python/xen/xend/XendLogging.py @@ -42,7 +42,7 @@ DEFAULT_MAX_BYTES = 1 << 20 # 1MB DEFAULT_BACKUP_COUNT = 5 STDERR_FORMAT = "[%(name)s] %(levelname)s (%(module)s:%(lineno)d) %(message)s" -LOGFILE_FORMAT = "[%(asctime)s %(name)s %(thread)d] %(levelname)s (%(module)s:%(lineno)d) %(message)s" +LOGFILE_FORMAT = "[%(asctime)s %(name)s] %(levelname)s (%(module)s:%(lineno)d) %(message)s" DATE_FORMAT = "%Y-%m-%d %H:%M:%S" diff --git a/tools/python/xen/xend/server/SrvDaemon.py b/tools/python/xen/xend/server/SrvDaemon.py index b984a67466..499da92f22 100644 --- a/tools/python/xen/xend/server/SrvDaemon.py +++ b/tools/python/xen/xend/server/SrvDaemon.py @@ -8,9 +8,7 @@ import os import signal import sys -import thread import threading -import time import linecache import pwd import re @@ -203,8 +201,6 @@ class Daemon: pass def print_trace(self, string): - self.tracefile.write(time.strftime("%Y-%m-%d %H:%M:%S ")) - self.tracefile.write("%10x" % thread.get_ident()) for i in range(self.traceindent): ch = " " if (i % 5): diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 110850da26..7b56ad497b 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -12,7 +12,7 @@ BASECFLAGS=-Wall -g -Werror # Make gcc generate dependencies. BASECFLAGS += -Wp,-MD,.$(@F).d PROG_DEP = .*.d -BASECFLAGS+= -O0 -ggdb3 $(PROFILE) +BASECFLAGS+= -O3 $(PROFILE) #BASECFLAGS+= -I$(XEN_ROOT)/tools BASECFLAGS+= -I$(XEN_ROOT)/tools/libxc BASECFLAGS+= -I. diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index a1ea5ddba4..5c3a77be83 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -14,7 +14,7 @@ CFLAGS += -I $(XEN_LIBXC) HDRS = $(wildcard *.h) OBJS = $(patsubst %.c,%.o,$(wildcard *.c)) -BIN = xentrace tbctl setsize xenctx +BIN = xentrace tbctl setsize SCRIPTS = xentrace_format MAN1 = $(wildcard *.1) MAN8 = $(wildcard *.8) diff --git a/xen/Rules.mk b/xen/Rules.mk index acb2515f85..f9721f03a2 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -2,8 +2,8 @@ # If you change any of these configuration options then you must # 'make clean' before rebuilding. # -verbose ?= y -debug ?= y +verbose ?= n +debug ?= n perfc ?= n perfc_arrays?= n domu_debug ?= n -- 2.30.2